Added do_without_error function, and squelch the error from mkdir when trying

to create the lock directory.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/examples/xen-hotplug-common.sh b/tools/examples/xen-hotplug-common.sh
index 4c2c83695315302e2ee2abeb9d26d233f28833ef..ce9a9f6e1ae8e08fbd862943bf355a94742467dc 100644 (file)
--- a/tools/examples/xen-hotplug-common.sh
+++ b/tools/examples/xen-hotplug-common.sh
@@ -46,6 +46,10 @@ do_or_die() {
   "$@" || fatal "$@ failed"
 }
 
+do_without_error() {
+  "$@" 2>/dev/null || log debug "$@ failed"
+}
+
 sigerr() {
   fatal "$0 failed; error detected."
 }
@@ -121,7 +125,7 @@ _claim_lock()
 
   while [ $retries -lt $LOCK_RETRIES ]
   do
-    mkdir "$lockdir" && trap "release_lock $1; sigerr" ERR &&
+    mkdir "$lockdir" 2>/dev/null && trap "release_lock $1; sigerr" ERR &&
       _update_lock_info "$lockdir" && return
 
     local new_owner=$(_lock_owner "$lockdir")